From 61ddc1c44d63ef7a3efba6f55742194bf34843e5 Mon Sep 17 00:00:00 2001
From: Robert Lipe <robertlipe@gpsbabel.org>
Date: Tue, 18 Dec 2018 23:25:09 -0600
Subject: [PATCH] Remove (now) unused xhtmlent table.

---
 GPSBabel.pro          | 2 +-
 Makefile.in           | 2 +-
 mac/libusb/darwin.c   | 2 ++
 mac/libusb/usb.c      | 3 ++-
 msvc/GPSBabel.vcxproj | 3 +--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/GPSBabel.pro b/GPSBabel.pro
index 75abb6ba7..74ba499d6 100644
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -32,7 +32,7 @@ ALL_FMTS=$$MINIMAL_FMTS gtm.cc gpsutil.cc pcx.cc \
         saroute.cc navicache.cc psitrex.cc delgpl.cc \
         ozi.cc text.cc html.cc netstumbler.cc \
         igc.cc brauniger_iq.cc shape.cc hiketech.cc glogbook.cc \
-        vcf.cc xhtmlent.cc lowranceusr.cc an1.cc tomtom.cc \
+        vcf.cc lowranceusr.cc an1.cc tomtom.cc \
         tef_xml.cc maggeo.cc vitosmt.cc gdb.cc bcr.cc \
         ignrando.cc stmwpp.cc cst.cc nmn4.cc compegps.cc \
         yahoo.cc unicsv.cc wfff_xml.cc garmin_txt.cc gpssim.cc \
diff --git a/Makefile.in b/Makefile.in
index ff2126c1f..0b5cc5706 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,7 +73,7 @@ ALL_FMTS=$(MINIMAL_FMTS) gtm.o gpsutil.o  \
 	saroute.o navicache.o psitrex.o delgpl.o \
 	text.o html.o netstumbler.o \
 	igc.o brauniger_iq.o shape.o hiketech.o glogbook.o  \
-	vcf.o xhtmlent.o lowranceusr.o an1.o tomtom.o \
+	vcf.o lowranceusr.o an1.o tomtom.o \
 	tef_xml.o maggeo.o vitosmt.o bcr.o \
 	ignrando.o stmwpp.o cst.o nmn4.o compegps.o \
 	yahoo.o unicsv.o wfff_xml.o garmin_txt.o gpssim.o \
diff --git a/mac/libusb/darwin.c b/mac/libusb/darwin.c
index d52b6b757..3cac80f38 100644
--- a/mac/libusb/darwin.c
+++ b/mac/libusb/darwin.c
@@ -672,6 +672,7 @@ int usb_claim_interface(usb_dev_handle *dev, int interface)
 int usb_release_interface(usb_dev_handle *dev, int interface)
 {
   struct darwin_dev_handle *device;
+  (void) interface;
   io_return_t result;
 
   if (!dev)
@@ -1160,6 +1161,7 @@ int usb_os_find_devices(struct usb_bus *bus, struct usb_device **devices)
 
 int usb_os_determine_children(struct usb_bus *bus)
 {
+  (void) bus;
   /* Nothing yet */
   return 0;
 }
diff --git a/mac/libusb/usb.c b/mac/libusb/usb.c
index 9b8773e11..51bc7bbaf 100644
--- a/mac/libusb/usb.c
+++ b/mac/libusb/usb.c
@@ -230,7 +230,7 @@ int usb_get_string(usb_dev_handle *dev, int index, int langid, char *buf,
 int usb_get_string_simple(usb_dev_handle *dev, int index, char *buf, size_t buflen)
 {
   char tbuf[255];	/* Some devices choke on size > 255 */
-  int ret, langid, si, di;
+  int ret, langid, si;
 
   /*
    * Asking for the zero'th index is special - it returns a string
@@ -258,6 +258,7 @@ int usb_get_string_simple(usb_dev_handle *dev, int index, char *buf, size_t bufl
   if (tbuf[0] > ret)
     return -EFBIG;
 
+  unsigned di;
   for (di = 0, si = 2; si < tbuf[0]; si += 2) {
     if (di >= (buflen - 1))
       break;
diff --git a/msvc/GPSBabel.vcxproj b/msvc/GPSBabel.vcxproj
index c8f6dd09a..30d756a81 100644
--- a/msvc/GPSBabel.vcxproj
+++ b/msvc/GPSBabel.vcxproj
@@ -330,7 +330,6 @@
     <ClCompile Include="wfff_xml.cc" />
     <ClCompile Include="wintec_tes.cc" />
     <ClCompile Include="xcsv.cc" />
-    <ClCompile Include="xhtmlent.cc" />
     <ClCompile Include="xmlgeneric.cc" />
     <ClCompile Include="src\core\xmlstreamwriter.cc" />
     <ClCompile Include="xmltag.cc" />
@@ -445,4 +444,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file
+</Project>
-- 
2.30.2